Tweak handling of custom-enabled-themes and custom-safe-themes.
authorChong Yidong <cyd@gnu.org>
Thu, 5 Jan 2012 11:12:11 +0000 (19:12 +0800)
committerChong Yidong <cyd@gnu.org>
Thu, 5 Jan 2012 11:12:11 +0000 (19:12 +0800)
commit4fa731bf4943aa3a98fb8ba532420b8db6d4a07e
tree6e9b5d7e8525190967b64a456a7e6a5ec48e386b
parentc94c0734c06c6f6a50b1344b046b6e857915f141
Tweak handling of custom-enabled-themes and custom-safe-themes.

* lisp/cus-theme.el (custom-theme-merge-theme): Ignore
custom-enabled-themes and custom-safe-themes.

* lisp/custom.el (enable-theme): Don't set custom-safe-themes.
lisp/ChangeLog
lisp/cus-theme.el
lisp/custom.el